Index: applications/order/template/entry/AdditionalPartyListing.ftl =================================================================== --- applications/order/template/entry/AdditionalPartyListing.ftl (revision 1801264) +++ applications/order/template/entry/AdditionalPartyListing.ftl (working copy) @@ -37,7 +37,7 @@
${party}
- <#if partyData[party].type == "person"> + <#if "person" == partyData[party].type> ${partyData[party].firstName!} <#else> ${partyData[party].groupName!} @@ -46,7 +46,7 @@
- <#if partyData[party].type == "person"> + <#if "person" == partyData[party].type> ${partyData[party].lastName!}
Index: applications/order/template/entry/BillSettings.ftl =================================================================== --- applications/order/template/entry/BillSettings.ftl (revision 1801264) +++ applications/order/template/entry/BillSettings.ftl (working copy) @@ -78,7 +78,7 @@ @@ -86,7 +86,7 @@ @@ -93,7 +93,7 @@
<#if paymentMethodList?has_content> <#list paymentMethodList as paymentMethod> - <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD"> + <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId> <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)> @@ -108,7 +108,7 @@ ${uiLabelMap.CommonUpdate} - <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT"> + <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId> <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)> @@ -128,9 +128,9 @@ - <#elseif paymentMethodType?? || finalizeMode?default("") == "payment"> + <#elseif paymentMethodType?? || "payment" == finalizeMode?default("")> <#-- after initial screen; show detailed screens for selected type --> - <#if paymentMethodType == "CC"> + <#if "CC" == paymentMethodType> <#if postalAddress?has_content>
@@ -141,7 +141,7 @@ - <#if paymentMethodType == "EFT"> + <#if "EFT" == paymentMethodType> <#if postalAddress?has_content> @@ -260,7 +260,7 @@ <#-- credit card fields --> - <#if paymentMethodType == "CC"> + <#if "CC" == paymentMethodType> <#if !creditCard?has_content> <#assign creditCard = requestParameters> @@ -282,10 +282,10 @@ @@ -316,13 +316,13 @@ @@ -470,11 +470,11 @@ <#if "Y" != requestParameters.createNew?default("")> - + - + Index: applications/order/template/entry/CheckInits.ftl =================================================================== --- applications/order/template/entry/CheckInits.ftl (revision 1801264) +++ applications/order/template/entry/CheckInits.ftl (working copy) @@ -150,7 +150,7 @@ - <#if shoppingCart.getOrderType() == "PURCHASE_ORDER"> + <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()> - <#if shoppingCart.getOrderType() == "PURCHASE_ORDER"> + <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()> - <#if shoppingCart.getOrderType() == "PURCHASE_ORDER"> + <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()> <#assign currentOrderItemType = cartLine.getItemTypeGenericValue()!/> Index: applications/order/template/entry/catalog/CategoryDetail.ftl =================================================================== --- applications/order/template/entry/catalog/CategoryDetail.ftl (revision 1801264) +++ applications/order/template/entry/catalog/CategoryDetail.ftl (working copy) @@ -87,7 +87,7 @@ ${uiLabelMap.ProductAddProductsUsingDefaultQuantities} - <#if searchInCategory?default("Y") == "Y"> + <#if "Y" == searchInCategory?default("Y")> ${uiLabelMap.ProductSearchInCategory} <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION", "html")!/> Index: applications/order/template/entry/catalog/CompareProducts.ftl =================================================================== --- applications/order/template/entry/catalog/CompareProducts.ftl (revision 1801264) +++ applications/order/template/entry/catalog/CompareProducts.ftl (working copy) @@ -42,7 +42,7 @@ <#assign priceStyle = "regularPrice"> - <#if (price.price?default(0) > 0 && product.requireAmount?default("N") == "N")> + <#if (price.price?default(0) > 0 && "N" == product.requireAmount?default("N"))> <#if "Y" = product.isVirtual!> ${uiLabelMap.CommonFrom} <@ofbizCurrency amount=price.price isoCode=price.currencyUsed/> @@ -54,18 +54,18 @@ <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)/>
${uiLabelMap.ProductNoLongerAvailable}
<#-- check to see if it is a rental item; will enter parameters on the detail screen--> - <#elseif product.productTypeId! == "ASSET_USAGE"/> + <#elseif "ASSET_USAGE" == product.productTypeId!/> ${uiLabelMap.OrderMakeBooking}... - <#elseif product.productTypeId! == "ASSET_USAGE_OUT_IN"/> + <#elseif "ASSET_USAGE_OUT_IN" == product.productTypeId!/> ${uiLabelMap.OrderRent}... <#-- check to see if it is an aggregated or configurable product; will enter parameters on the detail screen--> - <#elseif product.productTypeId! == "AGGREGATED" || product.productTypeId! == "AGGREGATED_SERVICE"/> + <#elseif "AGGREGATED" == product.productTypeId! || "AGGREGATED_SERVICE" == product.productTypeId!/> ${uiLabelMap.OrderConfigure}... <#-- check to see if the product is a virtual product --> - <#elseif product.isVirtual?? && product.isVirtual == "Y"/> + <#elseif product.isVirtual?? && "Y" == product.isVirtual/> ${uiLabelMap.OrderChooseVariations}... <#-- check to see if the product requires an amount --> - <#elseif product.requireAmount?? && product.requireAmount == "Y"/> + <#elseif product.requireAmount?? && "Y" == product.requireAmount/> ${uiLabelMap.OrderChooseAmount}... <#else> additem" name="compareFormAdd${product_index}"> @@ -158,18 +158,18 @@ <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)/>
${uiLabelMap.ProductNoLongerAvailable}
<#-- check to see if it is a rental item; will enter parameters on the detail screen--> - <#elseif product.productTypeId! == "ASSET_USAGE"/> + <#elseif "ASSET_USAGE" == product.productTypeId!/> ${uiLabelMap.OrderMakeBooking}... - <#elseif product.productTypeId! == "ASSET_USAGE_OUT_IN"/> + <#elseif "ASSET_USAGE_OUT_IN" == product.productTypeId!/> ${uiLabelMap.OrderRent}... <#-- check to see if it is an aggregated or configurable product; will enter parameters on the detail screen--> - <#elseif product.productTypeId! == "AGGREGATED" || product.productTypeId! == "AGGREGATED_SERVICE"/> + <#elseif "AGGREGATED" == product.productTypeId! || "AGGREGATED_SERVICE" == product.productTypeId!/> ${uiLabelMap.OrderConfigure}... <#-- check to see if the product is a virtual product --> - <#elseif product.isVirtual?? && product.isVirtual == "Y"/> + <#elseif product.isVirtual?? && "Y" == product.isVirtual/> ${uiLabelMap.OrderChooseVariations}... <#-- check to see if the product requires an amount --> - <#elseif product.requireAmount?? && product.requireAmount == "Y"/> + <#elseif product.requireAmount?? && "Y" == product.requireAmount/> ${uiLabelMap.OrderChooseAmount}... <#else> additem" name="compare2FormAdd${product_index}"> Index: applications/order/template/entry/catalog/ConfigProductDetail.ftl =================================================================== --- applications/order/template/entry/catalog/ConfigProductDetail.ftl (revision 1801264) +++ applications/order/template/entry/catalog/ConfigProductDetail.ftl (working copy) @@ -58,15 +58,15 @@ function popupDetail() { var defaultDetailImage = "${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}"; - if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") { + if (defaultDetailImage == null || "null" == defaultDetailImage || "" == defaultDetailImage) { defaultDetailImage = "_NONE_"; } - if (detailImageUrl == null || detailImageUrl == "null") { + if (detailImageUrl == null || "null" == detailImageUrl) { detailImageUrl = defaultDetailImage; } - if (detailImageUrl == "_NONE_") { + if ("_NONE_" == detailImageUrl) { hack = document.createElement('span'); hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}"; showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonNoDetailImageAvailableToDisplay}"); @@ -287,7 +287,7 @@ <#assign inStock = true> <#-- Variant Selection --> - <#if product.isVirtual?? && product.isVirtual?upper_case == "Y"> + <#if product.isVirtual?? && "Y" == product.isVirtual?upper_case> <#if variantTree?? && 0 < variantTree.size()> <#list featureSet as currentType>
@@ -330,7 +330,7 @@ <#-- check to see if the product requires inventory check and has inventory --> <#else> <#if inStock> - <#if product.requireAmount?default("N") == "Y"> + <#if "Y" == product.requireAmount?default("N")> <#assign hiddenStyle = "visible"> <#else> <#assign hiddenStyle = "hidden"> @@ -628,7 +628,7 @@ <#if assocProducts?has_content>
- + <#list assocProducts as productAssoc> @@ -143,8 +143,8 @@ Index: applications/order/template/entry/order/OrderItems.ftl =================================================================== --- applications/order/template/entry/order/OrderItems.ftl (revision 1801264) +++ applications/order/template/entry/order/OrderItems.ftl (working copy) @@ -40,7 +40,7 @@ <#assign itemType = orderItem.getRelatedOne("OrderItemType", false)!> - <#if orderItem.productId?? && orderItem.productId == "_?_"> + <#if orderItem.productId?? && "_?_" == orderItem.productId> @@ -75,7 +75,7 @@ <#-- show info from workeffort if it was a rental item --> - <#if orderItem.orderItemTypeId?? && orderItem.orderItemTypeId == "RENTAL_ORDER_ITEM"> + <#if orderItem.orderItemTypeId?? && "RENTAL_ORDER_ITEM" == orderItem.orderItemTypeId> <#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)!> <#if WorkOrderItemFulfillments?has_content> <#list WorkOrderItemFulfillments as WorkOrderItemFulfillment> @@ -95,7 +95,7 @@ ${uiLabelMap.OrderAdjustment}:${localOrderReadHelper.getAdjustmentType(orderItemAdjustment)}  <#if orderItemAdjustment.description?has_content>: ${StringUtil.wrapString(orderItemAdjustment.get("description",locale))} - <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> + <#if "SALES_TAX" == orderItemAdjustment.orderAdjustmentTypeId> <#if orderItemAdjustment.primaryGeoId?has_content> <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/> <#if primaryGeo.geoName?has_content> Index: applications/order/template/entry/order/OrderPaymentInfo.ftl =================================================================== --- applications/order/template/entry/order/OrderPaymentInfo.ftl (revision 1801264) +++ applications/order/template/entry/order/OrderPaymentInfo.ftl (working copy) @@ -28,7 +28,7 @@ <#-- offline payment address infomation :: change this to use Company's address --> <#if !paymentMethod?has_content && paymentMethodType?has_content> - <#if paymentMethodType.paymentMethodTypeId == "EXT_OFFLINE"> + <#if "EXT_OFFLINE" == paymentMethodType.paymentMethodTypeId> - <#if orderHeader.orderTypeId == "PURCHASE_ORDER" && purchaseOrderItemTypeList?has_content> + <#if "PURCHASE_ORDER" == orderHeader.orderTypeId && purchaseOrderItemTypeList?has_content> <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)!> <#assign productId = orderItem.productId!> - <#if productId?? && productId == "shoppingcart.CommentLine"> + <#if productId?? && "shoppingcart.CommentLine" == productId> @@ -151,7 +151,7 @@ - <#if orderHeader.orderTypeId == "PURCHASE_ORDER"> + <#if "PURCHASE_ORDER" == orderHeader.orderTypeId> <#assign remainingQuantity = ((orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - totalReceived?double)> <#else> <#assign remainingQuantity = ((orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - shippedQuantity?double)> @@ -162,7 +162,7 @@
 
- disabled> <#list organizations as organization> <#assign organizationName = Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(organization, true)/> <#if (organizationName.length() != 0)> @@ -178,7 +178,7 @@
 
- disabled> <#list suppliers as supplier> Index: applications/order/template/entry/CheckoutOptions.ftl =================================================================== --- applications/order/template/entry/CheckoutOptions.ftl (revision 1801264) +++ applications/order/template/entry/CheckoutOptions.ftl (working copy) @@ -20,51 +20,51 @@ -<#if shoppingCart.getOrderType() == "PURCHASE_ORDER"> +<#if "PURCHASE_ORDER" == shoppingCart.getOrderType()> <#assign target="productAvailabalityByFacility"> <#else> <#assign target="getProductInventoryAvailable"> @@ -33,7 +33,7 @@
- <#if shoppingCart.getOrderType() == "SALES_ORDER"> + <#if "SALES_ORDER" == shoppingCart.getOrderType()>
<#if quantityOnHandTotal?? && availableToPromiseTotal?? && (productId)??>
    @@ -133,7 +133,7 @@
${uiLabelMap.OrderOrderItemType} :
 @@ -168,7 +168,7 @@
Index: applications/order/template/entry/cart/ShowCartItems.ftl =================================================================== --- applications/order/template/entry/cart/ShowCartItems.ftl (revision 1801264) +++ applications/order/template/entry/cart/ShowCartItems.ftl (working copy) @@ -34,7 +34,7 @@ <#if (shoppingCartSize > 0)>
- <#if shoppingCart.getOrderType() == "PURCHASE_ORDER"> + <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()> @@ -169,7 +169,7 @@
@@ -280,7 +280,7 @@
- <#if cartLine.getIsPromo() || (shoppingCart.getOrderType() == "SALES_ORDER" && !security.hasEntityPermission("ORDERMGR", "_SALES_PRICEMOD", session))> + <#if cartLine.getIsPromo() || ("SALES_ORDER" == shoppingCart.getOrderType() && !security.hasEntityPermission("ORDERMGR", "_SALES_PRICEMOD", session))> <@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=currencyUomId/> <#else> <#if (cartLine.getSelectedAmount() > 0) > Index: applications/order/template/entry/catalog/AdvancedSearch.ftl =================================================================== --- applications/order/template/entry/catalog/AdvancedSearch.ftl (revision 1801264) +++ applications/order/template/entry/catalog/AdvancedSearch.ftl (working copy) @@ -46,8 +46,8 @@
  - - + +
 

${beforeName!}<#if showName == "Y">${productContentWrapper.get("PRODUCT_NAME", "html")!}${afterName!}

${beforeName!}<#if "Y" == showName>${productContentWrapper.get("PRODUCT_NAME", "html")!}${afterName!}

Index: applications/order/template/entry/catalog/InlineProductDetail.ftl =================================================================== --- applications/order/template/entry/catalog/InlineProductDetail.ftl (revision 1801264) +++ applications/order/template/entry/catalog/InlineProductDetail.ftl (working copy) @@ -26,15 +26,15 @@ function popupDetailInline(inlineCounter) { var imageField = 'detailImage' + inlineCounter; var defaultDetailImage = document.getElementById(imageField); - if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") { + if (defaultDetailImage == null || "null" == defaultDetailImage || "" == defaultDetailImage) { defaultDetailImage = "_NONE_"; } var fieldName = 'detailImageUrl' + inlineCounter; - if (window[fieldName] == null || window[fieldName] == "null") { + if (window[fieldName] == null || "null" == window[fieldName]) { window[fieldName] = defaultDetailImage; } - if (window[fieldName] == "_NONE_") { + if ("_NONE_" == window[fieldName]) { hack = document.createElement('span'); hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}"; showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonNoDetailImageAvailableToDisplay}"); @@ -230,7 +230,7 @@ -<#if product.virtualVariantMethodEnum! == "VV_FEATURETREE" && featureLists?has_content> +<#if "VV_FEATURETREE" == product.virtualVariantMethodEnum! && featureLists?has_content> <#if product??> <#-- variable setup --> - <#if backendPath?default("N") == "Y"> + <#if "Y" == backendPath?default("N")> <#assign productUrl><@ofbizCatalogUrl productId=product.productId productCategoryId=categoryId/> <#else> <#assign productUrl><@ofbizCatalogAltUrl productId=product.productId productCategoryId=categoryId/> @@ -111,18 +111,18 @@ <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)>
${uiLabelMap.ProductNoLongerAvailable}
<#-- check to see if it is a rental item; will enter parameters on the detail screen--> - <#elseif product.productTypeId! == "ASSET_USAGE"> + <#elseif "ASSET_USAGE" == product.productTypeId!> ${uiLabelMap.OrderMakeBooking}... <#-- check to see if it is an aggregated or configurable product; will enter parameters on the detail screen--> - <#elseif product.productTypeId! == "AGGREGATED" || product.productTypeId! == "AGGREGATED_SERVICE"> + <#elseif "AGGREGATED" == product.productTypeId! || "AGGREGATED_SERVICE" == product.productTypeId!> ${uiLabelMap.OrderConfigure}... <#-- check to see if the product is a virtual product --> - <#elseif product.isVirtual?? && product.isVirtual == "Y"> + <#elseif product.isVirtual?? && "Y" == product.isVirtual> ${uiLabelMap.OrderChooseVariations}... <#-- check to see if the product requires an amount --> - <#elseif product.requireAmount?? && product.requireAmount == "Y"> + <#elseif product.requireAmount?? && "Y" == product.requireAmount> ${uiLabelMap.OrderChooseAmount}... - <#elseif product.productTypeId! == "ASSET_USAGE_OUT_IN"> + <#elseif "ASSET_USAGE_OUT_IN" == product.productTypeId!> ${uiLabelMap.OrderRent}... <#else> @@ -210,7 +210,7 @@ <#assign priceStyle = "regularPrice"> - <#if (price.price?default(0) > 0 && product.requireAmount?default("N") == "N")> + <#if (price.price?default(0) > 0 && "N" == product.requireAmount?default("N"))> ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual!> ${uiLabelMap.CommonFrom} <@ofbizCurrency amount=price.price isoCode=price.currencyUsed/> @@ -221,7 +221,7 @@ <#-- show price details ("showPriceDetails" field can be set in the screen definition) --> - <#if (showPriceDetails?? && showPriceDetails?default("N") == "Y")> + <#if (showPriceDetails?? && "Y" == showPriceDetails?default("N"))> <#if price.orderItemPriceInfos??> <#list price.orderItemPriceInfos as orderItemPriceInfo>
${orderItemPriceInfo.description!}
Index: applications/order/template/entry/catalog/QuickAddSummary.ftl =================================================================== --- applications/order/template/entry/catalog/QuickAddSummary.ftl (revision 1801264) +++ applications/order/template/entry/catalog/QuickAddSummary.ftl (working copy) @@ -50,7 +50,7 @@ <#elseif product.salesDiscontinuationDate?? && nowTimestamp.before(product.salesDiscontinuationDate)> ${uiLabelMap.ProductNoLongerAvailable} <#-- check to see if the product is a virtual product --> - <#elseif product.isVirtual?default("N") == "Y"> + <#elseif "Y" == product.isVirtual?default("N")> ${uiLabelMap.OrderChooseVariations}... <#else> Index: applications/order/template/entry/order/OrderHeaderInfo.ftl =================================================================== --- applications/order/template/entry/order/OrderHeaderInfo.ftl (revision 1801264) +++ applications/order/template/entry/order/OrderHeaderInfo.ftl (working copy) @@ -115,8 +115,8 @@ 		 
- <#if maySplit?default("N") == "N">${uiLabelMap.FacilityWaitEntireOrderReady} - <#if maySplit?default("Y") == "Y">${uiLabelMap.FacilityShipAvailable} + <#if "N" == maySplit?default("N")>${uiLabelMap.FacilityWaitEntireOrderReady} + <#if "Y" == maySplit?default("Y")>${uiLabelMap.FacilityShipAvailable}
 
- <#if isGift?default("N") == "N">${uiLabelMap.OrderThisOrderNotGift} - <#if isGift?default("N") == "Y">${uiLabelMap.OrderThisOrderGift} + <#if "N" == isGift?default("N")>${uiLabelMap.OrderThisOrderNotGift} + <#if "Y" == isGift?default("N")>${uiLabelMap.OrderThisOrderGift}
>> ${orderItem.itemDescription}
${uiLabelMap.AccountingOfflinePayment}
<#if orderHeader?has_content && paymentAddress?has_content> Index: applications/order/template/order/AppendOrderItem.ftl =================================================================== --- applications/order/template/order/AppendOrderItem.ftl (revision 1801264) +++ applications/order/template/order/AppendOrderItem.ftl (working copy) @@ -105,7 +105,7 @@
${uiLabelMap.OrderOrderItemType} Index: applications/order/template/order/EditOrderItems.ftl =================================================================== --- applications/order/template/order/EditOrderItems.ftl (revision 1801264) +++ applications/order/template/order/EditOrderItems.ftl (working copy) @@ -70,7 +70,7 @@
>> ${orderItem.itemDescription} <#-- check for permission to modify price --> - <#if (allowPriceChange) && !(orderItem.statusId == "ITEM_CANCELLED" || orderItem.statusId == "ITEM_COMPLETED")> + <#if (allowPriceChange) && !("ITEM_CANCELLED" == orderItem.statusId || "ITEM_COMPLETED" == orderItem.statusId)>   <#else> @@ -213,7 +213,7 @@ ${uiLabelMap.OrderAdjustment} ${adjustmentType.get("description",locale)}  ${orderItemAdjustment.get("description",locale)!} (${orderItemAdjustment.comments?default("")}) - <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> + <#if "SALES_TAX" == orderItemAdjustment.orderAdjustmentTypeId> <#if orderItemAdjustment.primaryGeoId?has_content> <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/> ${uiLabelMap.OrderJurisdiction} ${primaryGeo.geoName} [${primaryGeo.abbreviation!}] @@ -300,7 +300,7 @@ <#assign adjustmentAmount = Static["org.apache.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(orderHeaderAdjustment, orderSubTotal)> <#assign orderAdjustmentId = orderHeaderAdjustment.get("orderAdjustmentId")> <#assign productPromoCodeId = ''> - <#if adjustmentType.get("orderAdjustmentTypeId") == "PROMOTION_ADJUSTMENT" && orderHeaderAdjustment.get("productPromoId")?has_content> + <#if "PROMOTION_ADJUSTMENT" == adjustmentType.get("orderAdjustmentTypeId") && orderHeaderAdjustment.get("productPromoId")?has_content> <#assign productPromo = orderHeaderAdjustment.getRelatedOne("ProductPromo", false)> <#assign productPromoCodes = delegator.findByAnd("ProductPromoCode", {"productPromoId":productPromo.productPromoId}, null, false)> <#assign orderProductPromoCode = ''> @@ -344,7 +344,7 @@ - <#if adjustmentType.get("orderAdjustmentTypeId") == "PROMOTION_ADJUSTMENT"> + <#if "PROMOTION_ADJUSTMENT" == adjustmentType.get("orderAdjustmentTypeId")> Index: applications/order/template/order/FindOrders.ftl =================================================================== --- applications/order/template/order/FindOrders.ftl (revision 1801264) +++ applications/order/template/order/FindOrders.ftl (working copy) @@ -38,7 +38,7 @@ var orders = form.elements.length; for (var i = 0; i < orders; i++) { var element = form.elements[i]; - if (element.name == "orderIdList") { + if ("orderIdList" == element.name) { element.checked = master.checked; } } @@ -57,7 +57,7 @@ var isAllSelected = true; for (var i = 0; i < orders; i++) { var element = form.elements[i]; - if (element.name == "orderIdList" && !element.checked) + if ("orderIdList" == element.name && !element.checked) isAllSelected = false; } jQuery('#checkAllOrders').attr("checked", isAllSelected); @@ -127,7 +127,7 @@
checked="checked" /> + <#if "Y" == requestParameters.filterInventoryProblems?default("N")>checked="checked" />
@@ -429,7 +429,7 @@ checked="checked" /> + <#if "Y" == requestParameters.filterPartiallyReceivedPOs?default("N")>checked="checked" /> @@ -443,7 +443,7 @@ checked="checked" /> + <#if "Y" == requestParameters.filterPOsOpenPastTheirETA?default("N")>checked="checked" /> @@ -457,7 +457,7 @@ checked="checked" /> + <#if "Y" == requestParameters.filterPOsWithRejectedItems?default("N")>checked="checked" /> @@ -605,7 +605,7 @@ ${uiLabelMap.OrderRemainingSubTotal} ${uiLabelMap.OrderOrderTotal}   - <#if (requestParameters.filterInventoryProblems?default("N") == "Y") || (requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y") || (requestParameters.filterPOsWithRejectedItems?default("N") == "Y") || (requestParameters.filterPartiallyReceivedPOs?default("N") == "Y")> + <#if ("Y" == requestParameters.filterInventoryProblems?default("N")) || ("Y" == requestParameters.filterPOsOpenPastTheirETA?default("N")) || ("Y" == requestParameters.filterPOsWithRejectedItems?default("N")) || ("Y" == requestParameters.filterPartiallyReceivedPOs?default("N"))> ${uiLabelMap.CommonStatus} ${uiLabelMap.CommonFilter} <#else> @@ -621,7 +621,7 @@ <#assign orh = Static["org.apache.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)> <#assign statusItem = orderHeader.getRelatedOne("StatusItem", true)> <#assign orderType = orderHeader.getRelatedOne("OrderType", true)> - <#if orderType.orderTypeId == "PURCHASE_ORDER"> + <#if "PURCHASE_ORDER" == orderType.orderTypeId> <#assign displayParty = orh.getSupplierAgent()!> <#else> <#assign displayParty = orh.getPlacingParty()!> @@ -658,7 +658,7 @@   ${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))} - <#if (requestParameters.filterInventoryProblems?default("N") == "Y") || (requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y") || (requestParameters.filterPOsWithRejectedItems?default("N") == "Y") || (requestParameters.filterPartiallyReceivedPOs?default("N") == "Y")> + <#if ("Y" == requestParameters.filterInventoryProblems?default("N")) || ("Y" == requestParameters.filterPOsOpenPastTheirETA?default("N")) || ("Y" == requestParameters.filterPOsWithRejectedItems?default("N")) || ("Y" == requestParameters.filterPartiallyReceivedPOs?default("N"))> <#if filterInventoryProblems.contains(orderHeader.orderId)> Inv  Index: applications/order/template/order/OrderContactInfo.ftl =================================================================== --- applications/order/template/order/OrderContactInfo.ftl (revision 1801264) +++ applications/order/template/order/OrderContactInfo.ftl (working copy) @@ -24,7 +24,7 @@ @@ -34,7 +34,7 @@ - <#if currentStatus.statusId == "ORDER_CREATED" || currentStatus.statusId == "ORDER_PROCESSING"> + <#if "ORDER_CREATED" == currentStatus.statusId || "ORDER_PROCESSING" == currentStatus.statusId>
  • ${uiLabelMap.OrderApproveOrder}
    @@ -47,7 +47,7 @@
    • - <#elseif currentStatus.statusId == "ORDER_APPROVED"> + <#elseif "ORDER_APPROVED" == currentStatus.statusId>
  • ${uiLabelMap.OrderHold}
    @@ -58,7 +58,7 @@
    • - <#elseif currentStatus.statusId == "ORDER_HOLD"> + <#elseif "ORDER_HOLD" == currentStatus.statusId>
  • ${uiLabelMap.OrderApproveOrder}
    @@ -242,9 +242,9 @@
    @@ -259,8 +259,8 @@
    @@ -267,7 +267,7 @@
    - <#if orderHeader.isViewed?has_content && orderHeader.isViewed == "Y"> + <#if orderHeader.isViewed?has_content && "Y" == orderHeader.isViewed> ${uiLabelMap.OrderViewed} Index: applications/order/template/order/OrderItems.ftl =================================================================== --- applications/order/template/order/OrderItems.ftl (revision 1801264) +++ applications/order/template/order/OrderItems.ftl (working copy) @@ -47,11 +47,11 @@ <#list orderItemList as orderItem> <#assign orderItemContentWrapper = Static["org.apache.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)> <#assign orderItemShipGrpInvResList = orderReadHelper.getOrderItemShipGrpInvResList(orderItem)> - <#if orderHeader.orderTypeId == "SALES_ORDER"><#assign pickedQty = orderReadHelper.getItemPickedQuantityBd(orderItem)> - class="alternate-row"> + <#if "SALES_ORDER" == orderHeader.orderTypeId><#assign pickedQty = orderReadHelper.getItemPickedQuantityBd(orderItem)> + class="alternate-row"> <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)!> <#assign productId = orderItem.productId!> - <#if productId?? && productId == "shoppingcart.CommentLine"> + <#if productId?? && "shoppingcart.CommentLine" == productId> >> ${orderItem.itemDescription} <#else> @@ -103,8 +103,8 @@ - class="alternate-row"> - <#if productId?? && productId == "shoppingcart.CommentLine"> + class="alternate-row"> + <#if productId?? && "shoppingcart.CommentLine" == productId> >> ${orderItem.itemDescription} <#else> @@ -242,11 +242,11 @@ - <#if product.productTypeId == "SERVICE" && currentItemStatus.statusId == "ITEM_COMPLETED"> + <#if "SERVICE" == product.productTypeId && "ITEM_COMPLETED" == currentItemStatus.statusId> <#assign shippedQuantity = orderItem.quantity?default(0)/> <#assign totalReceived = orderItem.quantity?default(0)> - <#if orderHeader.orderTypeId == "PURCHASE_ORDER"> + <#if "PURCHASE_ORDER" == orderHeader.orderTypeId> <#assign remainingQuantity = ((orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - totalReceived?double)> <#else> <#assign remainingQuantity = ((orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - shippedQuantity?double)> @@ -266,8 +266,8 @@ ${uiLabelMap.OrderCancelled} ${orderItem.cancelQuantity?default(0)?string.number} - <#if orderHeader.orderTypeId == "SALES_ORDER"> - <#if pickedQty gt 0 && orderHeader.statusId == "ORDER_APPROVED"> + <#if "SALES_ORDER" == orderHeader.orderTypeId> + <#if pickedQty gt 0 && "ORDER_APPROVED" == orderHeader.statusId> ${uiLabelMap.OrderQtyPicked} ${pickedQty?default(0)?string.number} <#else> @@ -282,7 +282,7 @@ ${uiLabelMap.OrderRemaining} ${remainingQuantity} - <#if orderHeader.orderTypeId == "PURCHASE_ORDER"> + <#if "PURCHASE_ORDER" == orderHeader.orderTypeId> ${uiLabelMap.OrderPlannedInReceive} ${totalReceived} <#else> @@ -296,11 +296,11 @@ ${uiLabelMap.OrderOutstanding} <#-- Make sure digital goods without shipments don't always remainn "outstanding": if item is completed, it must have no outstanding quantity. --> - <#if (orderItem.statusId?has_content) && (orderItem.statusId == "ITEM_COMPLETED")> + <#if (orderItem.statusId?has_content) && ("ITEM_COMPLETED" == orderItem.statusId)> 0 - <#elseif orderHeader.orderTypeId == "PURCHASE_ORDER"> + <#elseif "PURCHASE_ORDER" == orderHeader.orderTypeId> ${(orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - totalReceived?double} - <#elseif orderHeader.orderTypeId == "SALES_ORDER"> + <#elseif "SALES_ORDER" == orderHeader.orderTypeId> ${(orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - shippedQuantity?double} @@ -337,7 +337,7 @@ <#if workOrderItemFulfillments?has_content> <#list workOrderItemFulfillments as workOrderItemFulfillment> <#assign workEffort = workOrderItemFulfillment.getRelatedOne("WorkEffort", true)> - class="alternate-row"> + class="alternate-row">   <#if orderItem.orderItemTypeId != "RENTAL_ORDER_ITEM"> @@ -367,7 +367,7 @@ <#assign linkedOrderItemValue = linkedOrderItem.getRelatedOne("ToOrderItem", false)> <#assign linkedOrderItemValueStatus = linkedOrderItemValue.getRelatedOne("StatusItem", false)> <#assign description = linkedOrderItem.getRelatedOne("OrderItemAssocType", false).getString("description")/> - class="alternate-row"> + class="alternate-row">   ${uiLabelMap.OrderLinkedToOrderItem} (${description!}) @@ -384,7 +384,7 @@ <#assign linkedOrderItemValue = linkedOrderItem.getRelatedOne("FromOrderItem", false)> <#assign linkedOrderItemValueStatus = linkedOrderItemValue.getRelatedOne("StatusItem", false)> <#assign description = linkedOrderItem.getRelatedOne("OrderItemAssocType", false).getString("description")/> - class="alternate-row"> + class="alternate-row">   ${uiLabelMap.OrderLinkedFromOrderItem} (${description!}) @@ -398,7 +398,7 @@ <#assign linkedRequirements = orderItem.getRelated("OrderRequirementCommitment", null, null, false)!> <#if linkedRequirements?has_content> <#list linkedRequirements as linkedRequirement> - class="alternate-row"> + class="alternate-row">   ${uiLabelMap.OrderLinkedToRequirement}  @@ -411,7 +411,7 @@ <#-- show linked quote --> <#assign linkedQuote = orderItem.getRelatedOne("QuoteItem", true)!> <#if linkedQuote?has_content> - class="alternate-row"> + class="alternate-row">   ${uiLabelMap.OrderLinkedToQuote}  @@ -425,7 +425,7 @@ <#if orderItemAdjustments?? && orderItemAdjustments?has_content> <#list orderItemAdjustments as orderItemAdjustment> <#assign adjustmentType = orderItemAdjustment.getRelatedOne("OrderAdjustmentType", true)> - class="alternate-row"> + class="alternate-row"> ${uiLabelMap.OrderAdjustment} ${adjustmentType.get("description",locale)} ${StringUtil.wrapString(orderItemAdjustment.get("description",locale)!)} @@ -436,7 +436,7 @@ ${orderItemAdjustment.getRelatedOne("ProductPromo", false).getString("promoName")} - <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> + <#if "SALES_TAX" == orderItemAdjustment.orderAdjustmentTypeId> <#if orderItemAdjustment.primaryGeoId?has_content> <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/> <#if primaryGeo.geoName?has_content> @@ -470,11 +470,11 @@ <#-- now show price info per line item --> <#assign orderItemPriceInfos = orderReadHelper.getOrderItemPriceInfos(orderItem)> <#if orderItemPriceInfos?? && orderItemPriceInfos?has_content> - class="alternate-row"> + class="alternate-row">   <#list orderItemPriceInfos as orderItemPriceInfo> - class="alternate-row"> + class="alternate-row"> ${uiLabelMap.ProductPriceRuleNameId} [${orderItemPriceInfo.productPriceRuleId!}:${orderItemPriceInfo.productPriceActionSeqId!}] ${orderItemPriceInfo.description!} @@ -491,7 +491,7 @@ <#assign orderItemSurveyResponses = Static["org.apache.ofbiz.order.order.OrderReadHelper"].getOrderItemSurveyResponse(orderItem)> <#if orderItemSurveyResponses?? && orderItemSurveyResponses?has_content> <#list orderItemSurveyResponses as survey> - class="alternate-row"> + class="alternate-row"> ${uiLabelMap.CommonSurveys}  <#-- display the ship estimated/before/after dates --> <#if orderItem.estimatedShipDate??> - class="alternate-row"> + class="alternate-row"> ${uiLabelMap.OrderEstimatedShipDate} ${Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.estimatedShipDate, "", locale, timeZone)!} @@ -511,7 +511,7 @@ <#if orderItem.estimatedDeliveryDate??> - class="alternate-row"> + class="alternate-row"> ${uiLabelMap.OrderOrderQuoteEstimatedDeliveryDate} ${Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.estimatedDeliveryDate, "", locale, timeZone)!} @@ -519,7 +519,7 @@ <#if orderItem.shipAfterDate??> - class="alternate-row"> + class="alternate-row"> ${uiLabelMap.OrderShipAfterDate} ${Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.shipAfterDate, "", locale, timeZone)!} @@ -527,7 +527,7 @@ <#if orderItem.shipBeforeDate??> - class="alternate-row"> + class="alternate-row"> ${uiLabelMap.OrderShipBeforeDate} ${Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.shipBeforeDate, "", locale, timeZone)!} @@ -540,7 +540,7 @@ <#list orderItemShipGroupAssocs as shipGroupAssoc> <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup", false)> <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)!> - class="alternate-row"> + class="alternate-row"> ${uiLabelMap.OrderShipGroup} [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")} @@ -555,7 +555,7 @@ <#-- now show inventory reservation info per line item --> <#if orderItemShipGrpInvResList?? && orderItemShipGrpInvResList?has_content> <#list orderItemShipGrpInvResList as orderItemShipGrpInvRes> - class="alternate-row"> + class="alternate-row"> ${uiLabelMap.CommonInventory}  <#if orderShipments?has_content> <#list orderShipments as orderShipment> - class="alternate-row"> + class="alternate-row"> ${uiLabelMap.OrderPlannedInShipment}  <#if itemIssuances?has_content> <#list itemIssuances as itemIssuance> - class="alternate-row"> + class="alternate-row"> <#if itemIssuance.shipmentId?has_content> ${uiLabelMap.OrderIssuedToShipmentItem}  @@ -621,7 +621,7 @@ <#-- now show item issuances (inventory item) per line item --> <#if itemIssuances?has_content> <#list itemIssuances as itemIssuance> - class="alternate-row"> + class="alternate-row"> <#if itemIssuance.inventoryItemId?has_content> <#assign inventoryItem = itemIssuance.getRelatedOne("InventoryItem", false)/> @@ -646,7 +646,7 @@ <#assign shipmentReceipts = orderItem.getRelated("ShipmentReceipt", null, null, false)!> <#if shipmentReceipts?has_content> <#list shipmentReceipts as shipmentReceipt> - class="alternate-row"> + class="alternate-row"> <#if shipmentReceipt.shipmentId?has_content> ${uiLabelMap.OrderShipmentReceived}  @@ -667,7 +667,7 @@ <#if orderItem.comments?has_content> - class="alternate-row"> + class="alternate-row">  
    @@ -707,7 +707,7 @@ - <#if itemClass == "2"> + <#if "2" == itemClass> <#assign itemClass = "1"> <#else> <#assign itemClass = "2"> Index: applications/order/template/order/OrderNotes.ftl =================================================================== --- applications/order/template/order/OrderNotes.ftl (revision 1801264) +++ applications/order/template/order/OrderNotes.ftl (working copy) @@ -47,7 +47,7 @@ ${note.noteInfo?replace("\n", "
    ")} - <#if note.internalNote! == "N"> + <#if "N" == note.internalNote!> ${uiLabelMap.OrderPrintableNote}
    @@ -56,7 +56,7 @@ ${uiLabelMap.OrderNotesPrivate}
    - <#if note.internalNote! == "Y"> + <#if "Y" == note.internalNote!> ${uiLabelMap.OrderNotPrintableNote}
    Index: applications/order/template/order/OrderPaymentInfo.ftl =================================================================== --- applications/order/template/order/OrderPaymentInfo.ftl (revision 1801264) +++ applications/order/template/order/OrderPaymentInfo.ftl (working copy) @@ -41,7 +41,7 @@
    <#assign orderTypeId = orderReadHelper.getOrderTypeId()> - <#if orderTypeId == "PURCHASE_ORDER"> + <#if "PURCHASE_ORDER" == orderTypeId> @@ -115,7 +115,7 @@ <#assign paymentList = orderPaymentPreference.getRelated("Payment", null, null, false)> <#assign pmBillingAddress = {}> <#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem", false)> - <#if outputted?default("false") == "true"> + <#if "true" == outputted?default("false")> <#assign outputted = "true"> @@ -123,11 +123,11 @@ <#assign paymentMethod = orderPaymentPreference.getRelatedOne("PaymentMethod", false)!> <#if !paymentMethod?has_content> <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType", false)> - <#if paymentMethodType.paymentMethodTypeId == "EXT_BILLACT"> + <#if "EXT_BILLACT" == paymentMethodType.paymentMethodTypeId> <#assign outputted = "false"> <#-- billing account --> <#if billingAccount??> - <#if outputted?default("false") == "true"> + <#if "true" == outputted?default("false")> @@ -171,7 +171,7 @@ - <#elseif paymentMethodType.paymentMethodTypeId == "FIN_ACCOUNT"> + <#elseif "FIN_ACCOUNT" == paymentMethodType.paymentMethodTypeId> <#assign finAccount = orderPaymentPreference.getRelatedOne("FinAccount", false)!/> <#if (finAccount?has_content)> <#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse", null, null, false)> @@ -198,10 +198,10 @@ <#-- Authorize and Capture transactions -->
    - <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> + <#if "PAYMENT_SETTLED" != orderPaymentPreference.statusId> ${uiLabelMap.AccountingAuthorize} - <#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED"> + <#if "PAYMENT_AUTHORIZED" == orderPaymentPreference.statusId> ${uiLabelMap.AccountingCapture}
    @@ -312,7 +312,7 @@ <#else> - <#if paymentMethod.paymentMethodTypeId! == "CREDIT_CARD"> + <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId!> <#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse", null, null, false)> <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)!> <#if creditCard?has_content> @@ -351,10 +351,10 @@ <#-- Authorize and Capture transactions -->
    - <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> + <#if "PAYMENT_SETTLED" != orderPaymentPreference.statusId> ${uiLabelMap.AccountingAuthorize} - <#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED"> + <#if "PAYMENT_AUTHORIZED" == orderPaymentPreference.statusId> ${uiLabelMap.AccountingCapture}
    @@ -393,7 +393,7 @@ - <#elseif paymentMethod.paymentMethodTypeId! == "EFT_ACCOUNT"> + <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId!> <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)> <#if eftAccount?has_content> <#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress", false)!> @@ -448,7 +448,7 @@ - <#elseif paymentMethod.paymentMethodTypeId! == "GIFT_CARD"> + <#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId!> <#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false)> <#if giftCard??> <#assign pmBillingAddress = giftCard.getRelatedOne("PostalAddress", false)!> Index: applications/order/template/order/OrderReportBody.fo.ftl =================================================================== --- applications/order/template/order/OrderReportBody.fo.ftl (revision 1801264) +++ applications/order/template/order/OrderReportBody.fo.ftl (working copy) @@ -64,7 +64,7 @@ - <#if orderHeader.orderTypeId == "PURCHASE_ORDER"> + <#if "PURCHASE_ORDER" == orderHeader.orderTypeId> <#if internalImageUrl?has_content> Index: applications/order/template/order/OrderReportConditions.fo.ftl =================================================================== --- applications/order/template/order/OrderReportConditions.fo.ftl (revision 1801264) +++ applications/order/template/order/OrderReportConditions.fo.ftl (working copy) @@ -50,12 +50,12 @@ -<#if orderHeader.getString("orderTypeId") == "SALES_ORDER"> +<#if "SALES_ORDER" == orderHeader.getString("orderTypeId")> THANK YOU FOR YOUR PATRONAGE! <#-- Here is a good place to put policies and return information. --> -<#elseif orderHeader.getString("orderTypeId") == "PURCHASE_ORDER"> +<#elseif "PURCHASE_ORDER" == orderHeader.getString("orderTypeId")> <#-- Here is a good place to put boilerplate terms and conditions for a purchase order. --> Index: applications/order/template/order/OrderReportContactMechs.fo.ftl =================================================================== --- applications/order/template/order/OrderReportContactMechs.fo.ftl (revision 1801264) +++ applications/order/template/order/OrderReportContactMechs.fo.ftl (working copy) @@ -18,7 +18,7 @@ --> <#escape x as x?xml> -<#if orderHeader.getString("orderTypeId") == "PURCHASE_ORDER"> +<#if "PURCHASE_ORDER" == orderHeader.getString("orderTypeId")> <#if supplierGeneralContactMechValueMap??> <#assign contactMech = supplierGeneralContactMechValueMap.contactMech> ${uiLabelMap.OrderPurchasedFrom}: @@ -52,7 +52,7 @@ <#list orderContactMechValueMaps as orderContactMechValueMap> <#assign contactMech = orderContactMechValueMap.contactMech> <#assign contactMechPurpose = orderContactMechValueMap.contactMechPurposeType> - <#if contactMech.contactMechTypeId == "POSTAL_ADDRESS"> + <#if "POSTAL_ADDRESS" == contactMech.contactMechTypeId> <#assign postalAddress = orderContactMechValueMap.postalAddress> ${contactMechPurpose.get("description",locale)}: @@ -81,7 +81,7 @@ <#list orderPaymentPreferences as orderPaymentPreference> <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType", false)!> - <#if (orderPaymentPreference?? && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))> + <#if (orderPaymentPreference?? && ("CREDIT_CARD" == orderPaymentPreference.getString("paymentMethodTypeId")) && (orderPaymentPreference.getString("paymentMethodId")?has_content))> <#assign creditCard = orderPaymentPreference.getRelatedOne("PaymentMethod", false).getRelatedOne("CreditCard", false)> ${Static["org.apache.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)} <#else> @@ -90,7 +90,7 @@ -<#if orderHeader.getString("orderTypeId") == "SALES_ORDER" && shipGroups?has_content> +<#if "SALES_ORDER" == orderHeader.getString("orderTypeId") && shipGroups?has_content> ${uiLabelMap.OrderShipmentInformation}: <#list shipGroups as shipGroup> Index: applications/order/template/order/OrderShippingInfo.ftl =================================================================== --- applications/order/template/order/OrderShippingInfo.ftl (revision 1801264) +++ applications/order/template/order/OrderShippingInfo.ftl (working copy) @@ -56,9 +56,9 @@
      - <#if security.hasEntityPermission("FACILITY", "_CREATE", session) && ((orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT"))> + <#if security.hasEntityPermission("FACILITY", "_CREATE", session) && (("ORDER_APPROVED" == orderHeader.statusId) || ("ORDER_SENT" == orderHeader.statusId))> <#-- Special shipment options --> - <#if orderHeader.orderTypeId == "SALES_ORDER" && backorderQuantity < 1> + <#if "SALES_ORDER" == orderHeader.orderTypeId && backorderQuantity < 1>
    • @@ -65,7 +65,7 @@ ${uiLabelMap.OrderQuickShipEntireOrder}
      • <#else> <#-- PURCHASE_ORDER --> -  <#if orderHeader.orderTypeId == "PURCHASE_ORDER">${uiLabelMap.ProductDestinationFacility} +  <#if "PURCHASE_ORDER" == orderHeader.orderTypeId>${uiLabelMap.ProductDestinationFacility} <#if ownedFacilities?has_content> <#if !allShipments?has_content>
    • @@ -144,7 +144,7 @@
    • ${uiLabelMap.OrderViewEditDeliveryScheduleInfo}
      • <#if security.hasEntityPermission("ORDERMGR", "_RETURN", session)> - <#if orderHeader.statusId == "ORDER_COMPLETED" && returnableItems?has_content> + <#if "ORDER_COMPLETED" == orderHeader.statusId && returnableItems?has_content>
    • @@ -178,7 +178,7 @@
    • ${uiLabelMap.OrderCreateAsNewOrder}
      • - <#if orderHeader.statusId == "ORDER_COMPLETED"> + <#if "ORDER_COMPLETED" == orderHeader.statusId>
    • ${uiLabelMap.OrderCreateReplacementOrder}
      • @@ -230,7 +230,7 @@
    @@ -386,7 +386,7 @@ <#-- the setting of shipping method is only supported for sales orders at this time --> - <#if orderHeader.orderTypeId == "SALES_ORDER"> + <#if "SALES_ORDER" == orderHeader.orderTypeId>
    ${uiLabelMap.AccountingPaymentID} ${uiLabelMap.CommonTo}
    ${quantityOrdered}
    ${quantityNotAvailable}
    		 - <#if !orderItem.statusId?exists || orderItem.statusId == "ITEM_CREATED" || orderItem.statusId == "ITEM_APPROVED"> + <#if !orderItem.statusId?exists || "ITEM_CREATED" == orderItem.statusId || "ITEM_APPROVED" == orderItem.statusId> @@ -258,11 +258,11 @@  
    [${OISG.shipGroupSeqId}] <#if OISG.shipByDate?has_content>, ${uiLabelMap.OrderShipBeforeDate} : ${OISG.shipByDate?date}
    - <#if orderType == "SALES_ORDER"> + <#if "SALES_ORDER" == orderType> <#list orderShipments as orderShipment>
    ${uiLabelMap.OrderPlannedInShipment} : ${orderShipment.shipmentId!}:${orderShipment.shipmentItemSeqId!} - ${orderShipment.quantity!}
    - <#elseif orderType == "PURCHASE_ORDER"> + <#elseif "PURCHASE_ORDER" == orderType> <#list orderShipments as orderShipment> <#if orderShipment.quantity?has_content & orderShipment.quantity!=0.0 >
    ${uiLabelMap.OrderPlannedInReceive} : ${orderShipment.shipmentId!}:${orderShipment.shipmentItemSeqId!} - ${orderShipment.quantity!}
    @@ -287,7 +287,7 @@ - <#if !orderItem.statusId?exists || orderItem.statusId == "ITEM_CREATED" || orderItem.statusId == "ITEM_APPROVED" && (orderHeader.statusId != "ORDER_SENT" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED" && orderHeader.statusId != "ORDER_CANCELLED")> + <#if !orderItem.statusId?exists || "ITEM_CREATED" == orderItem.statusId || "ITEM_APPROVED" == orderItem.statusId && ("ORDER_SENT" != orderHeader.statusId && "ORDER_COMPLETED" != orderHeader.statusId && "ORDER_REJECTED" != orderHeader.statusId && "ORDER_CANCELLED" != orderHeader.statusId)>
     ${uiLabelMap.CommonMethod} @@ -626,7 +626,7 @@  
    - <#if shipGroup.maySplit?upper_case == "N"> + <#if "N" == shipGroup.maySplit?upper_case> ${uiLabelMap.FacilityWaitEntireOrderReady} <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)> <#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED"> @@ -777,7 +777,7 @@ <#-- shipment actions --> - <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && ((orderHeader.statusId == "ORDER_CREATED") || (orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT"))> + <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && (("ORDER_CREATED" == orderHeader.statusId) || ("ORDER_APPROVED" == orderHeader.statusId) || ("ORDER_SENT" == orderHeader.statusId))> <#-- Manual shipment options --> @@ -784,9 +784,9 @@
    - <#if orderHeader.orderTypeId == "SALES_ORDER"> + <#if "SALES_ORDER" == orderHeader.orderTypeId> <#if !shipGroup.supplierPartyId?has_content> - <#if orderHeader.statusId == "ORDER_APPROVED"> + <#if "ORDER_APPROVED" == orderHeader.statusId> ${uiLabelMap.OrderPackShipmentForShipGroup}
    Index: applications/order/template/order/Transitions.ftl =================================================================== --- applications/order/template/order/Transitions.ftl (revision 1801264) +++ applications/order/template/order/Transitions.ftl (working copy) @@ -30,7 +30,7 @@
    - <#if workEffortStatus == "WF_SUSPENDED"> + <#if "WF_SUSPENDED" == workEffortStatus> @@ -44,7 +44,7 @@ - <#if workEffortStatus == "WF_RUNNING"> + <#if "WF_RUNNING" == workEffortStatus>
    Index: applications/order/template/quote/QuoteReportBody.fo.ftl =================================================================== --- applications/order/template/quote/QuoteReportBody.fo.ftl (revision 1801264) +++ applications/order/template/quote/QuoteReportBody.fo.ftl (working copy) @@ -111,7 +111,7 @@ - <#if rowColor == "white"> + <#if "white" == rowColor> <#assign rowColor = "#D4D0C8"> <#else> <#assign rowColor = "white"> Index: applications/order/template/quote/ViewQuoteItemInfo.ftl =================================================================== --- applications/order/template/quote/ViewQuoteItemInfo.ftl (revision 1801264) +++ applications/order/template/quote/ViewQuoteItemInfo.ftl (working copy) @@ -19,7 +19,7 @@
    - <#if maySelectItems?default("N") == "Y"> + <#if "Y" == maySelectItems?default("N")> ${uiLabelMap.OrderAddAllToCart}
    @@ -68,7 +68,7 @@
    class="alternate-row" > @@ -124,7 +124,7 @@ @@ -233,7 +233,7 @@ Index: applications/order/template/return/ReturnItems.ftl =================================================================== --- applications/order/template/return/ReturnItems.ftl (revision 1801264) +++ applications/order/template/return/ReturnItems.ftl (working copy) @@ -69,12 +69,12 @@ <#if returnHeader?has_content> - <#if returnHeader.destinationFacilityId?has_content && returnHeader.statusId == "RETURN_ACCEPTED" && returnHeader.returnHeaderTypeId?starts_with("CUSTOMER_")> + <#if returnHeader.destinationFacilityId?has_content && "RETURN_ACCEPTED" == returnHeader.statusId && returnHeader.returnHeaderTypeId?starts_with("CUSTOMER_")> <#list returnShipmentIds as returnShipmentId> ${uiLabelMap.ProductShipmentId} ${returnShipmentId.shipmentId}${uiLabelMap.OrderReceiveReturn} - <#elseif returnHeader.statusId == "SUP_RETURN_ACCEPTED" && returnHeader.returnHeaderTypeId == "VENDOR_RETURN"> + <#elseif "SUP_RETURN_ACCEPTED" == returnHeader.statusId && "VENDOR_RETURN" == returnHeader.returnHeaderTypeId> <#if returnShipmentIds?has_content> <#list returnShipmentIds as returnShipmentId> ${uiLabelMap.ProductShipmentId} ${returnShipmentId.shipmentId} @@ -234,7 +234,7 @@ <#if (readOnly)> - <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED"> + <#if "RETURN_REQUESTED" == returnHeader.statusId || "SUP_RETURN_REQUESTED" == returnHeader.statusId> <#else> @@ -315,7 +315,7 @@ - <#if (returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED") && (rowCount > 0)> + <#if ("RETURN_REQUESTED" == returnHeader.statusId || "SUP_RETURN_REQUESTED" == returnHeader.statusId) && (rowCount > 0)>
    <#if returnHeader.returnHeaderTypeId?starts_with("CUSTOMER_")> @@ -330,7 +330,7 @@ - <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED"> + <#if "RETURN_REQUESTED" == returnHeader.statusId || "SUP_RETURN_REQUESTED" == returnHeader.statusId>
    Index: applications/order/template/setup/PaymentSetup.ftl =================================================================== --- applications/order/template/setup/PaymentSetup.ftl (revision 1801264) +++ applications/order/template/setup/PaymentSetup.ftl (working copy) @@ -56,7 +56,7 @@ <#if paymentSetups?has_content> <#list paymentSetups as paymentSetting> - <#if rowStyle?? && rowStyle == "alternate-row"> + <#if rowStyle?? && "alternate-row" == rowStyle> <#assign rowStyle = "alternate-rowSelected"> <#else> <#assign rowStyle = "alternate-row"> Index: applications/order/template/task/OrderTaskList.ftl =================================================================== --- applications/order/template/task/OrderTaskList.ftl (revision 1801264) +++ applications/order/template/task/OrderTaskList.ftl (working copy) @@ -77,7 +77,7 @@ <#assign partyId = "_NA_"> <#if placingParty?has_content> <#assign partyId = placingParty.partyId> - <#if placingParty.getEntityName() == "Person"> + <#if "Person" == placingParty.getEntityName()> <#if placingParty.lastName??> ${placingParty.lastName}<#if placingParty.firstName??>, ${placingParty.firstName} <#else> @@ -205,7 +205,7 @@ - <#if task.statusId?? && task.statusId == "CAL_SENT"> + <#if task.statusId?? && "CAL_SENT" == task.statusId> @@ -250,7 +250,7 @@
    ${actualStartDate}
    - <#if task.statusId?? && task.statusId == "CAL_SENT"> + <#if task.statusId?? && "CAL_SENT" == task.statusId> <#else>
    - <#if showQuoteManagementLinks?? && quoteItem.isPromo?default("N") == "N" && quote.statusId=="QUO_CREATED"> + <#if showQuoteManagementLinks?? && "N" == quoteItem.isPromo?default("N") && "QUO_CREATED" == quote.statusId> ${quoteItem.quoteItemSeqId} <#else> ${quoteItem.quoteItemSeqId} Index: applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl =================================================================== --- applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl (revision 1801264) +++ applications/order/template/reports/OrderPurchaseReportPayment.fo.ftl (working copy) @@ -104,7 +104,7 @@ <#-- toggle the row color --> - <#if rowColor == "white"> + <#if "white" == rowColor> <#assign rowColor = "#D4D0C8"> <#else> <#assign rowColor = "white"> Index: applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl =================================================================== --- applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl (revision 1801264) +++ applications/order/template/reports/OrderPurchaseReportProduct.fo.ftl (working copy) @@ -114,7 +114,7 @@ <#-- toggle the row color --> - <#if rowColor == "white"> + <#if "white" == rowColor> <#assign rowColor = "#D4D0C8"> <#else> <#assign rowColor = "white"> Index: applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl =================================================================== --- applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl (revision 1801264) +++ applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl (working copy) @@ -79,7 +79,7 @@ <#-- toggle the row color --> - <#if rowColor == "white"> + <#if "white" == rowColor> <#assign rowColor = "#D4D0C8"> <#else> <#assign rowColor = "white"> Index: applications/order/template/reports/SalesByStoreReport.fo.ftl =================================================================== --- applications/order/template/reports/SalesByStoreReport.fo.ftl (revision 1801264) +++ applications/order/template/reports/SalesByStoreReport.fo.ftl (working copy) @@ -91,7 +91,7 @@ <#-- toggle the row color --> - <#if rowColor == "white"> + <#if "white" == rowColor> <#assign rowColor = "#D4D0C8"> <#else> <#assign rowColor = "white"> Index: applications/order/template/return/ReturnItemInc.ftl =================================================================== --- applications/order/template/return/ReturnItemInc.ftl (revision 1801264) +++ applications/order/template/return/ReturnItemInc.ftl (working copy) @@ -59,7 +59,7 @@ <#assign rowCount = 0> <#assign alt_row = false> <#list returnableItems.keySet() as orderItem> - <#if orderItem.getEntityName() == "OrderAdjustment"> + <#if "OrderAdjustment" == orderItem.getEntityName()> <#-- this is an order item adjustment --> <#assign returnAdjustmentType = returnItemTypeMap.get(orderItem.get("orderAdjustmentTypeId"))/> <#assign adjustmentType = orderItem.getRelatedOne("OrderAdjustmentType", false)/> @@ -79,7 +79,7 @@
    		<#if orderItem.productId??> <#assign product = orderItem.getRelatedOne("Product", false)/> - <#if product.productTypeId == "ASSET_USAGE_OUT_IN"> + <#if "ASSET_USAGE_OUT_IN" == product.productTypeId> <#else> @@ -196,7 +196,7 @@ - <#if returnHeader.statusId == "RETURN_COMPLETED" || returnHeader.statusId == "SUP_RETURN_COMPLETED"> + <#if "RETURN_COMPLETED" == returnHeader.statusId || "SUP_RETURN_COMPLETED" == returnHeader.statusId> <#assign itemResp = item.getRelatedOne("ReturnItemResponse", false)!> <#if itemResp?has_content> <#if itemResp.paymentId?has_content> @@ -252,7 +252,7 @@ ${uiLabelMap.CommonRemove} 
    - <#if task.wepaPartyId == "_NA_"> + <#if "_NA_" == task.wepaPartyId>
    N/A
    <#else> ${task.wepaPartyId} @@ -263,7 +263,7 @@ ${Static["org.apache.ofbiz.order.task.TaskWorker"].getPrettyStatus(task)}